Fix for os.popen problems on some systems. Not pretty.
40c9c46925x-Rjb0Cv2f1-l2jZrPYg tools/python/xen/xend/server/netif.py
40c9c469ZqILEQ8x6yWy0_51jopiCg tools/python/xen/xend/server/params.py
40c9c469LNxLVizOUpOjEaTKKCm8Aw tools/python/xen/xend/sxp.py
+4189125cL90jKSOcBJ3Vx4nWGiXXvA tools/python/xen/xend/util.py
40d05079aFRp6NQdo5wIh5Ly31c0cg tools/python/xen/xm/__init__.py
40cf2937gKQcATgXKGtNeWb1PDH5nA tools/python/xen/xm/create.py
40f552eariuUSB9TWqCPnDLz5zvxMw tools/python/xen/xm/destroy.py
import re
from xen.sv.params import *
+from xen.xend import util
from twisted.internet import reactor
from twisted.web import static, server, script
cmdex = '(?P<cmd>.*)'
procre = re.compile('^\s*' + pidex + '\s*' + pythonex + '\s*' + cmdex + '$')
xendre = re.compile('^/usr/sbin/xend\s*(start|restart)\s*.*$')
- procs = os.popen('ps -e -o pid,args 2>/dev/null')
+ procs = util.popen('ps -e -o pid,args 2>/dev/null')
for proc in procs:
pm = procre.match(proc)
if not pm: continue
return 0
# Read the pid of the previous invocation and search active process list.
pid = open(PID_FILE, 'r').read()
- lines = os.popen('ps ' + pid + ' 2>/dev/null').readlines()
+ lines = util.popen('ps ' + pid + ' 2>/dev/null').readlines()
for line in lines:
if re.search('^ *' + pid + '.+xensv', line):
if not kill:
import re
import sys
+from xen.xend import util
+
os.defpath = os.defpath + ':/sbin:/usr/sbin:/usr/local/sbin'
CMD_IFCONFIG = 'ifconfig'
CMD_ROUTE = 'route'
def routes():
"""Return a list of the routes.
"""
- fin = os.popen(CMD_ROUTE + ' -n', 'r')
+ fin = util.popen(CMD_ROUTE + ' -n', 'r')
routes = []
for x in fin:
if x.startswith('Kernel'): continue
def ifconfig(interface):
"""Return the ip config for an interface,
"""
- fin = os.popen(CMD_IFCONFIG + ' %s' % interface, 'r')
+ fin = util.popen(CMD_IFCONFIG + ' %s' % interface, 'r')
inetre = re.compile('\s*inet\s*addr:(?P<address>\S*)\s*Bcast:(?P<broadcast>\S*)\s*Mask:(?P<mask>\S*)')
info = None
for x in fin:
import struct
import errno
+from xen.xend import util
+
def _readlines(fd):
"""Version of readlines safe against EINTR.
"""
returns interface address as a string
"""
- fd = os.popen( '/sbin/ifconfig ' + dev + ' 2>/dev/null' )
+ fd = util.popen( '/sbin/ifconfig ' + dev + ' 2>/dev/null' )
lines = _readlines(fd)
for line in lines:
m = re.search( '^\s+inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*',
returns interface netmask as a string
"""
- fd = os.popen( '/sbin/ifconfig ' + dev + ' 2>/dev/null' )
+ fd = util.popen( '/sbin/ifconfig ' + dev + ' 2>/dev/null' )
lines = _readlines(fd)
for line in lines:
m = re.search( '^.+Mask:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*',
returns gateway address as a string
"""
- fd = os.popen( '/sbin/route -n' )
+ fd = util.popen( '/sbin/route -n' )
lines = _readlines(fd)
for line in lines:
m = re.search( '^\S+\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)' +
import sys
import string
+from xen.xend import util
from xen.xend import XendRoot
xroot = XendRoot.instance()
script = os.path.join(SCRIPT_DIR, script)
args = [op] + string.split(dets, ':')
args = ' '.join(args)
- out = os.popen(script + ' ' + args)
+ out = util.popen(script + ' ' + args)
output = out.readline()
out.close()
from xen.xend.server import SrvServer
from xen.xend import XendRoot
from xen.xend.XendLogging import log
+from xen.xend import util
import channel
import blkif
cmdex = '(?P<cmd>.*)'
procre = re.compile('^\s*' + pidex + '\s*' + pythonex + '\s*' + cmdex + '$')
xendre = re.compile('^/usr/sbin/xend\s*(start|restart)\s*.*$')
- procs = os.popen('ps -e -o pid,args 2>/dev/null')
+ procs = util.popen('ps -e -o pid,args 2>/dev/null')
for proc in procs:
pm = procre.match(proc)
if not pm: continue
"""
running = 0
if pid:
- lines = os.popen('ps %d 2>/dev/null' % pid).readlines()
+ lines = util.popen('ps %d 2>/dev/null' % pid).readlines()
exp = '^ *%d.+%s' % (pid, name)
for line in lines:
if re.search(exp, line):
from xen.xend import Blkctl
from xen.xend.XendLogging import log
from xen.xend.XendError import XendError, VmError
+from xen.xend import util
import os
import re
def check_mounted(self, name):
mode = None
name = expand_dev_name(name)
- lines = os.popen('mount 2>/dev/null').readlines()
+ lines = util.popen('mount 2>/dev/null').readlines()
exp = re.compile('^' + name + ' .*[\(,]r(?P<mode>[ow])[,\)]')
for line in lines:
pm = exp.match(line)
--- /dev/null
+# Misc utility functions for Xend
+# (c) 2004 Mark A. Williamson <mark.williamson@cl.cam.ac.uk>
+
+from twisted.internet import utils
+from twisted.internet import reactor
+from XendLogging import log
+from StringIO import StringIO
+
+# This is rather distasteful. Twisted doesn't play nicely with Python's
+# standard os.popen, so here's an implementation of a synchronous popen that
+# should work reliably. - MAW
+def popen(cmd):
+ global done_flag, result
+
+ done_flag = False
+ result = ''
+
+ def done(output):
+ global done_flag, result
+ done_flag = True
+ result = output
+
+ def err(output):
+ global done_flag
+# For normal use, suppress debug output here. It grumbles about stderr if the
+# program exits with $? != 0, even if stderr is redirected. Grrr!
+# log.debug("util.popen(\'%s\'): %s" % (cmd, output))
+ done_flag = True
+
+ d = utils.getProcessOutput(cmd)
+ d.addCallbacks(done, err)
+
+ while not done_flag:
+ reactor.iterate()
+
+ return StringIO(result)
projects / xen.git / commitdiff